syncing fix
merged