resolving merge conflicts, when saved object did changed