Fix merge conflict with default_args