Fixed acn-update-self to use rebase instead of merge