Fix merge conflict with stager

Signed-off-by: Amit Gupta <agupta@pivotallabs.com>