Fix duplicate issue

A merge fail (full inventory) would cause an apparent duplicate issue and some mess with the server sync.