Fix selection highlight display
Fix selection highlight display

Use transparency instead of mix() to allow selection to show through.
Reduce intensity slightly for better visibility.

smashwilson/merge-conflicts,smashwilson/merge-conflicts