update merge conflict to add in comments tab to activity record