commit the list which in the branch of list
commit the list which in the branch of master
merge the branch which name is list

Conflicts:
	list

 I choice is the master!so it okay.