added edit to test-file-on-master
adding new file to test-branch-3
Changes on new branch test-branch-4
Edited the file added-on-test-branch-3
Merge branch 'test-branch-4' into test-branch-3

Conflicts:
	added-on-test-branch-3
Merge branch 'test-branch-3'

Conflicts:
	test-file-on-master