Update default.py

Fix conflict