Fix bad merge (#1149)
Fix bad merge (#1149)


realm/realm-core,realm/realm-core,realm/realm-object-store,realm/realm-core,realm/realm-object-store,realm/realm-object-store,realm/realm-core,realm/realm-core,realm/realm-core,realm/realm-core