Fix attributes merge

[closes #1357]