committing to merge changes
Committing categorizations of Tianyuan's parts