merge
fix error display & more