resolved merge conflicts from previous commit