merging my repo up to date