Fixed attributes for objects
fixed merge