Deleted some files from merge