fix upstream options
fix --upstream-development logic