removed unwanted files from merge