fix merging errors from uncommitted files of upstream repo (Twidere)