merge conflict resolve
Merge branch 'master' of github.com:maneeshnycda/kanye
Merge branch 'master' of github.com:maneeshnycda/kanye
Merge branch 'master' of github.com:maneeshnycda/kanye
resolve merge errors
Merge branch 'master' of github.com:maneeshnycda/kanye
Circle relocation