revert conflict line