Testing out doing conflicts in Git

Check out the title in home.