For practicing git conflict resolution