first commit for branch1
upadtes correct branch, Really
merge w/ conflict