merging my changes with most recent