this escalated quickly
rezolve conflict from windows app
grrrrrrrrrrrrrrrr
lets hope this works
rezolve conflict from shell