fix merge conlict