display consults as tables
resolved merge conflicts