Master Change
Conflict to resolve
Resolved conflict