finish pre and suf B4
fix merge conflict