These changes should all be fixed when you rebase.