front end started
front end started
fixed merge conflicts