fixes html merge conflicts