it wants me to commit gitignore
Committing merge after conflict resolution.

Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore