fixed conflict files