fixing merge markup