Fixed issue with shift key bypassing num filter
Added conflict detection with red backgrounds