first commit from new folder
resolved merge conflicts