fixed merge and removed a mostly