implemented mult and div
fixed merge conflict