hard commit 2
commit 3
Merge branch 'andriy'
with matvey
merge commit with comflicts