Add things to gitignore
Resolve conflict