fix underscore merge