Update .gitignore to remove merge conflict garbles