try to fix merge problem & minor in ui