issues after rebasing - Bazzite