There will be conflicts
Added new feature
Merge branch 'new-feature' of github.com:madis/many_rebase into new-feature