Fix merge conflict
Fix merge conflict

romeara/spdx-tools,sschuberth/spdx-tools,yevster/tools,romeara/spdx-tools,rtgdk/tools,sschuberth/spdx-tools,yevster/tools,romeara/spdx-tools,sschuberth/spdx-tools,sschuberth/spdx-tools,yevster/tools,sschuberth/spdx-tools,yevster/tools,yevster/tools,rtgdk/tools,goneall/SPDX-Tools,goneall/SPDX-Tools,rtgdk/tools,goneall/SPDX-Tools