Merge curry-base and curry-frontend