Agent: attempt to save merge conflicts; done