fixed merge conflicts, new results table