Fix a merge resolution error
Fix a merge resolution error

Brightspace/frau-publisher,j3parker/frau-publisher,j3parker/frau-publisher,Brightspace/gulp-frau-publisher,omsmith/gulp-frau-publisher,Brightspace/frau-publisher,Brightspace/gulp-frau-publisher