SYNC-1231

fixed merge issues