BlackMate GTK3: fix further merge conflict correctly