merge robs changes manually ... for some reason no in my repo