(MESS) resolve conflicts in my tree