experiment3 merge and resolve conflicts created due to own activity & collaborations activity ? qwerty