second change
ready for conflict
third line, conflict resolved