jasmine fixed
Merged conflict