Forgot to remove the conflict in the Makefile