Commit in new branch
Modify file-2.txt in branch "cbs-gittest-sync"
Merge remote-tracking branch 'remotes/origin/cbs-gittest-sync'

Conflicts:
	file-1.txt
	file-2.txt