first commit
resolved merge conflicts