Made some changes for a conflict resolution
Merge branch 'master' of https://github.com/czaas/test-list
 fixed the conflict that I made.
:wq
Conflicts:
	groceries.html
 fixed the conflict that I made.
 fixed the conflict that I made.
 fixed the conflict that I made.
 fixed the conflict that I made.
 fixed the conflict that I made.
 fixed the conflict that I made.
:wq:wq:wq:wq:wq:wq# It looks like you may be committing a merge.