revert last conflic