Manually resolve conflicts