resolve conflicts with merge