jh - trying to fix merge conflicts