There were conflict in the merge, created a patch and a applied it to a new branch.
Attach a file by drag & drop or click to upload