Added merging of armatures