tweak reversion confilct