Trying the merging on Ubuntu side