git commit on the forked branch
try again
adda line at the main
Merge branch 'fork1'

Conflicts:
	filewithconflict.txt