jasmine'e changes
fixed merge conflict