Fix the merge conflix issue (mainly about Makefile)