re-apply the changes from the other branch