merge front and backend