Fix merge conflicts
Change username to goodreads_name