resolve conflicts with pull