ok cool, I'll pull and see how it goes. Yes, simple conflict fixes didn't do as I tried that already - something more advanced was required :)