removed .bak files from merge