update Makefile to match what I used for 381p6
resolve merge conflict