Merge resolution.
Icon merge.
Tidying up a dodgy merge and adding a couple ternary string checks.