handled merge conflicts, messed up .gitignore and had to checkout older version of file to fix