[ build ] Removed -j3 flag from Makefile.
[ build ] Merged conflict in Makefile