.gitignore
conflict reso in .gitignore (yeah, really)