remove extra merge stuff