Fix: Time sync
Fix: merge conflicts on devteam box