Objective: Practice branching, merging, and resolving conflicts. Modification in main branch. Modification in feature-greeting branch.