fix post-merge formatting