commit
Add all dummies
file1
file2
foo
Conflict?
foo conflict
Man
GitHub