fixed conflict revert