Fix rebase conflicts, by delete shifter instance