ls
resolved merge conflict