Correcting conflict error
Merge branch 'root' of https://github.com/george-kankava/yours.git into root