fix integration conflict