front end continued
fixed merge conflicts