Fix erroneous merge conflict resolve - small bits