merge from blackbox