Solving conflicts and also fixing css for MM-1752

web/react/components/channel_notifications.jsx

@@ -300,7 +300,7 @@ export default class ChannelNotifications extends React.Component {
                                 <span aria-hidden='true'>&times;</span>
                                 <span className='sr-only'>Close</span>
                             </button>
-                            <h4 className='modal-title'>{'Notification Preferences for ' + this.state.title}</h4>
+                            <h4 className='modal-title'>Notification Preferences for <span className='name'>{this.state.title}</span></h4>
                         </div>
                         <div className='modal-body'>
                             <div className='settings-table'>