Added: 设计框架
Resolve conflict