Removed merge issue in the attribute type definition
Merge pull request #1101 from solivier/bugfix/remove-merge-issue

Removed merge issue in the attribute type definition