Malfunction fixes

In some cases, synchronization running in service mode fails when conflicts are detected