refactored notes getAll()
fixed conflict