James58899 says to YSITD
有衝突要手動合併啊