Merge branch 'master' of C:\Users\Leonard\Desktop\bootcamp\git\capstone-project with conflicts.
Testing Profile
Merge remote-tracking branch 'origin/master'