The hotly contested issue of what exactly needs to be filed for EEO-1 reporting this year has been resolved—at least for now. Pay data for both 2017 and 2018 must…