first intermediate commmit
resolved merge conflicts