begin history
manually resolve conflicts