# Conflicts: # application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java