try to fix merge conflicts