first folder
added text
conflict commit