merge admin directory with upstream