Fixed fixing of records in case of conflicts
Localnode is not anymore subject to the synch timeout