local deleted last line
used theirs