fixed merge-fail and build-fail