Simplify gitignore
Fix merge conflicts