Changed the same line
conflict resolved