JML board
resolved merge conflicts