Merge some some of your changes into my current version