removed the rest of the manual merge text