Cleanup after git automerge