first commit
resolved merge issue