add my first file
add another file with some other content.
modify existing file adding hi
add line on hallo.txt
let's resolve conflicts.