My First Commit!
Fixed merge conflicts.