Merge front-end done