Improved conflict case if remote object is deleted and the local object has been changed