Please add comments explaining which line is of what type (no change, delta, conflict).