Removed some merge text