Fix last error in Makefile from merge conflict.