Fix semantic merge conflict between #286 and #288.
Fix semantic merge conflict between #286 and #288.

alanjcfs/surveyor,NUBIC/surveyor,risuiowa/surveyor,HeHStudy/surveyor,alanjcfs/surveyor,anitsirc/surveyor,blueboard/surveyor,risuiowa/surveyor,HeHStudy/surveyor,Guestfolio/surveyor,markedmondson/surveyor,risuiowa/surveyor,markedmondson/surveyor,lampo/surveyor,bricesanchez/surveyor,fhisamoto/surveyor,anitsirc/surveyor,serracorwin/surveyor,blueboard/surveyor,fhisamoto/surveyor,alanjcfs/surveyor,Guestfolio/surveyor,alanjcfs/surveyor,markedmondson/surveyor,lampo/surveyor,HeHStudy/surveyor,blueboard/surveyor,serracorwin/surveyor,NUBIC/surveyor,NUBIC/surveyor,bricesanchez/surveyor,fhisamoto/surveyor,lampo/surveyor,bricesanchez/surveyor,lampo/surveyor,HeHStudy/surveyor,blueboard/surveyor,anitsirc/surveyor,risuiowa/surveyor,serracorwin/surveyor,fhisamoto/surveyor,bricesanchez/surveyor,Guestfolio/surveyor,Guestfolio/surveyor,anitsirc/surveyor