Merge front-end and back-end