reposync: fix stable merge error