deleted a line
resolved conflict