cart stable
All the conflicts have been resolved but the merge is not complete until you commit.
Merge branch 'master' of https://github.com/Gcobani/urbanbooks.git