Practice adding/committing
Deleting
Test
New file
Creating conflict
Creating feature conflict
Fixing conflict
Merge