resolved merge conflicts
commit before pull