Fixed missed common.constants conflict resolve