#Readme title? (from github) This is the first line (a possible conflict - local) Solved And a second line an extra line (possible conflict?) github SOLVED FROM LOCAL