GitHub repository: tkdev-02/Test-Branch-Merge-Conflicts
Description: Practicing branching, as well as resolving merge conflicts