Forgot to save Makefile and fix merge conflict. Oops.