Remove mergeFromUpstream option