fixed bad merge

had duplicate methods.