local change in branch 2, potential conflict
merge local and remote change

Conflicts:
	myfunc.js