Cleanup unresolved merge