Updated gitignore and removed leftover git merge conflicts code