I have a merge conflict in a Python file. One branch added a new argument 'timeout=30' to a function call, and the other branch renamed the function from 'fetch_data' to 'retrieve_data'. Show me the resolved code block keeping both changes.