Clean up after merge