resolve conflict
scenario plugin