Fix some merge problem