initial commit-remote
creating conflict
merging
update commit-remote.txt to be as in lesson