Merge our branch quickly ignoring conflicts with main

git merge -X ours main \
  -m "Merge main (prefer branch changes on conflicts)" \
  && git push