Clean up merge conflict trash from failed amend/merge