MAJ Makefile
Resolving conflicts