Fixed resetOp, so it removes conflict, even if reseting to a version identical to the current one
Merge pull request #503 from volaya/reset_conflict

Fixed resetOp, when used during conflict