resolved merge conflict, bug on the UI