updated conflict window package option selectors
Updated reverse colour rule/stripe conflict
Merge pull request #464 from shutter111/development

Updated reverse colour rule/stripe conflict