learn to tag
made a change
made other changes
new changes to testing
merging practice
merging conflicts
mergingConflicts
final merge conflict