bystartw_tw@tg
says to
YSITD
git checkout --ours or git checkout --their