IRepository error solved
conflicts resolved
Merge branch 'andrey'
working version