New file added: date1.txt
Merge branch 'master' of https://github.com/simgriff/git-workshop-notes
Conflict creation attempt