Hi Hao<br /><br />Yes, it does conflict - I will update the patch to fix these comments :)<br /><br />Thank you