more bad merge aftermath