Recover from merge conflicts