Removed Vector linking in Makefile
Fixed another merge conflict with master