minor changes to fix merge conflict