more merging changes
oops need that test