Update .gitignore

Remove git conflict markers