merging my update