match details page display updates
resolve merge conflicts