yxchng
fix conflicts and merge
adc32e6