Fix conflict added
Merge https://github.com/EvgenyKravchenko/first-project-ss-ita
Fix problem conflict SearchController