First commit
Added 2 lines to file.txt
First commit
Second commit
Fix conflicts from second_feature
Add something on 3
Merge with third_feature