ticket:1 fix requirments
merge conflicts