fixed merge w intuit