commit-merge conflict with armature

commit