fixed conflict file