Refactor makefile
Refactor
Merge conflict