try merge
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop

Conflicts:
	test.txt
try 2