merging my updates