changes to fix merge conflicts