Fix conflict row highlighting in draw confirmed page
Merge branch 'master' into feedback