Added solver for the situation of remote deletion and local changes