formatting changes that keep giving me merge conflicts