add front-end to project
resolve merge conflicts