GitHub repository: oberthewhat/MergeConflict-Practice
Primary language: HTML
Description: Practicing merge conflict in my ACA class