fixed merge
before Jessica meeting