getting data with a service, albeit fake data
resolving merge conflicts