Agent: attempt to save merge conflicts; not completely done