Hi Hao

Yes, it does conflict - I will update the patch to fix these comments :)

Thank you