oktw
says to
#ysitd
<pcchou>: @petjelinux 神祕演算法不能自動 merge 就會跳出來要你手動解 conflict