resolving remaining conflict

I made a slight mess trying to update my branch...hopefully I sorted it.