Cleanup after merge (trying)