Removed some random merge text