Remove spacing problems from the merges