Desktop conflict resolution discussion

feature-request

#1

There is a discussion in github about this ongoing, please join if you want to chime in or if you can provide additional research and user or market stories!