install commit
resolved merge conflict