Made some changes on a Sunday morning to try to introduce conflict
Finally got conflict resolved manually