Don't rediscover if conflict_resolution changed
Don't rediscover if conflict_resolution changed

mathstuf/vdirsyncer,mathstuf/vdirsyncer,credativUK/vdirsyncer,untitaker/vdirsyncer,tribut/vdirsyncer,hobarrera/vdirsyncer,untitaker/vdirsyncer,tribut/vdirsyncer,hobarrera/vdirsyncer,credativUK/vdirsyncer,untitaker/vdirsyncer