Hi! I got an idea. It would be great to be able to do conflict resolution with etherpad or some other web real-time editing tool. So that if there is a conflict when I try to update my code I could start an etherpad session and send a link to colleague developer responsible for conflicting code so that we can together resolve the conflict. Mitar