fix merge conflicts in base