make math works
fix conflict and make comment