Merge front and back end (fix)