try develop branch
first change from dev 2 to del branch
first change from dev 1
Merge branch 'develop' of https://github.com/tom-mtdo/hello-word into develop

Conflicts:
	third-file-develop-branch.txt

changed conflict
add the fourth file
change file 3 by dev1
Merge branch 'develop' of https://github.com/tom-mtdo/hello-word into develop
update from dev 2
change from dev1
Merge branch 'develop' of https://github.com/tom-mtdo/hello-word into develop

Conflicts:
	fourth-file-develop-branch.txt