am --abort: revert changes introduced by failed 3way merge