Conflict errors

There hasn't Ben a joke here in a while