test merge -- host end
Merge branch 'host_branch_readonly' into vb_branch_001

Conflicts:
	public_file.txt

solve the conflict by adding both line