removed stupid merge text