fixed merge complaints