linked critics
resolved merge conflict: