evolve: raise error.InterventionRequired instead of Abort when conflicts error.InterventionRequired is a better error to raise in such cases. Thanks to marmoute for noticing this.

     1

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