Fixes gitignore merge conflict.

Simplifies gitignore, and removes conflicts.