@smalien: merge will have