updata pipeline
conflict remote & local