Resolve conflicts with merge