Fix of merge conflict when trying to use an Object built-in