more bad merge + missing commits