change conflict files
fixed conflict