*.ipynb merge=theirs