testing retrieval methods
Fixing merge conflict