gcr fix conflicted files with gnome-keyring