Rebasing takes time. If the tool can somehow solves the problem. That would be great