oktw
says to
#ysitd
<petjelinux>: 所以我可以不用解conflicts