Fix to stage merge