Commit
Git conflict
Added git ignore