- fixed bad merge text