fixed merge conflicts for Jasmine and Donysa's projects