evolvecmd: the proper way to deal with conflicts is to resolve them And it's worth making the suggestion an actual hint.

{"site_id":"cf023865-0eb1-49e9-951b-29555949abf0","path":"html/"}