What is the way out of the dispute between colleagues that prevents good deeds from being accepted, and how can one initiate reconciliation despite repeated past attempts and the awkwardness of the current situation?

Jokes that lead to disagreement and estrangement among colleagues are not befitting of rational people. One should be moderate in joking because it can lead to animosity.

As for resolving estrangement, it is obligatory if it lasts more than three days, based on the Prophet's (PBUH) saying: "It is not lawful for a Muslim to desert his brother for more than three nights." The best of two quarreling people is the one who initiates the greeting of peace. If the other party does not return the greeting, the sin is upon him.