set mergeWithUpstream=1