Fix multiple derive calls in the same file#4

schneems merged 2 commits intomainheroku-buildpacks/cache_diff:mainfrom

schneems/no-useheroku-buildpacks/cache_diff:schneems/no-useCopy head branch name to clipboard