Removed bad merge text