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