resolve conflicts mark