Resolving Python Conflict