# Never merge settings.py - always use branch version
settings.py merge=ours