Resolve conflicts in conf
Resolve conflicts in conf

qiansl127/HiBench,nareshgundla/HiBench,cemsbr/HiBench,cemsbr/HiBench,maismail/HiBench,eriknor/HiBench,ConeyLiu/HiBench,eriknor/HiBench,nareshgundla/HiBench,eriknor/HiBench,qiansl127/HiBench,cemsbr/HiBench,eriknor/HiBench,maismail/HiBench,nareshgundla/HiBench,ConeyLiu/HiBench,ConeyLiu/HiBench,cemsbr/HiBench,qiansl127/HiBench,maismail/HiBench,maismail/HiBench,ConeyLiu/HiBench,nareshgundla/HiBench,qiansl127/HiBench