Merge branch 'master' of C:\Users\vandreev\IdeaProjects\amazon with conflicts.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of C:\Users\vandreev\IdeaProjects\amazon with conflicts.