Removed cached config.py and fixed synatx error in collectionMethods file.
Fixed merge conflicts.