[M] Update local repo and fix conflicts