MergeConflict-Practice

practice merge conflicts in my ACA class.

Name		Name	Last commit message	Last commit date
Latest commit History 3 Commits
.vscode		.vscode
README.md		README.md
index.html		index.html
styles.css		styles.css

Provide feedback