Hello, manual merging has been fixed, it should have priority everytime now. Let me know if you try again
Hello, ty for the report, it should be good now on the latest version
