Are you sure that's the only diff worth keeping? There's a lot of changes between the current Ubuntu and your merged version.
Are you sure that's the only diff worth keeping? There's a lot of changes between the current Ubuntu and your merged version.