New information.
Made a change on master.
Forcing a conflict.
Resolved conflict by using what was in 'master'.