Even more bad merge fixed