Ah ok. There are going to be some merge conflicts with my code then. I will pull your changes, resolve the conflict and then create a pull request. That way it won't be confusing.