yxchng
fix conflicts and merge
c70d148