problem with modal2
calculator working again
fixed merge conflicts