reso of merge update

git didnt sync :S