fixed some CM issue after rebase.  
changed the upstream location to remote/origin etc and then rebased.