Update cannot merge message

* https://github.com/openshift/origin-server/issues/669