README.md merge=keepTheirs
*.jpg filter=xet diff=xet merge=xet -text
*.png filter=xet diff=xet merge=xet -text