Cleared up yet another merge conflict in the advertisement parser and updated the makefile for assign