Oopsie doopsie, now the merging is fixed.