fixed conflict2