I have no idea why there is conflict
Merge branch 'master' of https://github.com/mrnikolov/CatalogueRepository.git