working on resolvers
wip
added scriptable conflict resolvers, a bit more work needed
Merge branch 'dip_resolvers'