Remove trailing whitespace
Float the gnome keyring manager
Fix merge conflict