change UI
fix merge code
fix code