pre merge
fix conflict
fix sum bugs