repair more merge crufties