Fixed mismerge of global sync service