Restore changes issed in rebase