fixed merge conflict
fixed merge conflict

Dwin357/HiveCHI-rwm,Dwin357/HiveCHI-rwm,Dwin357/HiveCHI-rwm,iamstephenliu/HiveCHI-rwm,Dwin357/HiveCHI-rwm,iamstephenliu/HiveCHI-rwm,iamstephenliu/HiveCHI-rwm,MozillaHive/HiveCHI-rwm,MozillaHive/HiveCHI-rwm,iamstephenliu/HiveCHI-rwm,MozillaHive/HiveCHI-rwm,MozillaHive/HiveCHI-rwm