Fixed conflict filter checkbox state being reset.

Yeah, that happened.
Conflict filter checkbox state is now recorded.

For list filtering and scrolling. Also added an import for the checkbox,
it missing wasn't causing problems, but it should still be there.