Fixed resetOp, when used during conflict

Reseting a given path was not removing the conflict if the path corresponded to a version identical to the current one in the index

Fixes #502