Fix merge error
Adding shifts in the popout