added scriptable conflict resolvers, a bit more work needed