fix merge conflict with autostaging