before merge
commit afetr merge
resolve conflict
Merge branch 'master' of github.com:vsg68/cup
Merge branch 'master' of github.com:vsg68/cup
after update vendor classes