fixing markup after merging