merge some front end shit