Fixed Makefile merge conflict.