- adjusted .gitignore merge conflict