objects.Map->objx.Obj
Fix merge conflict