add official mark
fix merge