I'll merge it, that will be easier for you, then you can make changes and I can merge that too.