update kakadu paramaters with recommended escaping
merge arguments into versionable & cleanup conflicts