resolved the merge conflict phil and i created earlier.