Master Change
Master Change 2

Resolving cnflicts
Branch commit 2