use update-shared-branch to fix shared vs local refs conflict
use update-shared-branch