Adds 1 to file1.txt
Adds stuff to file1.txt
Adds file2.txt
Adds 1 change to file2.txt
Adds 2 change to file2.txt
Adds 3 change to file2.txt
Resolves rebase conflict
Adds 2 to file1.txt
Adds file3.txt
Adds 1 change to file3.txt
Adds 2 change to file3.txt
Adds 3 change to file3.txt
Merge pull request #1 from alejndrofrnndz/feature

Feature