front end intended again
fixed merge conflicts