Entering a new line
conflict resolved