Continuing to merge the eatbyscraperrake into the master branch after pulling and resolving conflicts