I did the modifications
my test3.txt
Merge branch 'master' of https://github.com/Agencies/test1
new test
Merge branch 'master' of https://github.com/Agencies/test1
Merge branch 'master' of https://github.com/Agencies/test1

Conflicts:
	test3.txt
Merge branch 'master' of https://github.com/Agencies/test1
changed by Lucian
Merge branch 'master' of https://github.com/Agencies/test1
changed by lucian
test4 !!!
Merge branch 'master' of https://github.com/Agencies/test1