resolved merge conflict and moved buttons