Merging my changes