changed to line one
took git notes on order
message
resolved 0/one conflict to zero