deleted some random characters from merge