How to handle conflict resolution in hybrid work

Responsive image
source