Fixed merge conflict
Finishes front end and fixes merge conflict