fix merge issue
some bash configuration