increase the spacing in tag pre
process merge conflicts