Initial text files added to demonstrate commit
Changes to content of text3.txt
conflicting change in master to text3.txt
Conflict solved
Merge branch 'master' of github.com:urko99/demo-repo