cleaned up some temp files left during merging