You should be able to just pull the attached merge directive into the ubuntu branch and upload. This should fix all problems.
You should be able to just pull the attached merge directive into the ubuntu branch and upload. This should fix all problems.