manually resolve conflicts