delete line
resolved merge conflict
rm files