resolve conflicts 2