tweak .gitignore
fixing conflict