Updating makefile and cleaning up mis-merges.