merging my changes into the new fork