Fix merge conflict with origin/stage