Added Joe Critchley (that's me)
Resolve conflict.