changes to fix merge conflicts with command