minor formatting
stupid merge conflict