Create Conflict With Small Change
Created Duplicate Awesome File and Changed It to Create Conflict
Merge Conflict
Merge branch 'master' of https://github.com/ErinHyejin/phase-0-gps-1