removed weird merge text