Sean Wei says to YSITD
有衝突才需要 pull → merge → push