first commit from daniel
second commit from daniel
third commit from Daniel
fourth commit from Daniel
# this is new file
This is the third file by Daniel
resolved conflict