resolve merge markup