commit change in line 3 in folder b
avoid merge conflit
Merge branch 'master' of https://github.com/colacu/firstrepo

Conflicts:
	sync.txt