Fix Makefile after rebasing error