Temp merge cleanup