Removed .old files from merge