Gowri:fixed merge conflicts & failing integration tests