fixed ui
resolved merge