Removed merge issue in the attribute type definition

| Q                   | A
| ------------------- | ---
| Bug fix?            | Yes
| New feature?        | No
| BC breaks?          | No
| Tests pass?         | Yes
| Scenarios pass?     | ?
| Checkstyle issues?  | No
| Changelog updated?  | No
| Fixed tickets       | No
| Doc PR              | No