important stuff
line endings, bad merge