architecture chapter merged