Makefile switch to use merges, and deploy to prod