I think this was that strange issue with rebasing with your edit.  I think it should be ok??