use logic from `conflict` plugin. this should probably be externalized to a util
use logic from `conflict` plugin. this should probably be externalized to a util

assemble/verb,verbose/verb,doowb/verb,stefanwalther/verb,GerHobbelt/verb