Implemented Merge. Added Makefile