Index: js/_enqueues/admin/edit-comments.js
===================================================================
--- js/_enqueues/admin/edit-comments.js	(revision 47167)
+++ js/_enqueues/admin/edit-comments.js	(working copy)
@@ -435,7 +435,7 @@
 
 			el.before(h);
 
-			$('strong', '#undo-' + id).text(author);
+			$('strong', '#undo-' + id).replaceWith(author);
 			a = $('.undo a', '#undo-' + id);
 			a.attr('href', 'comment.php?action=un' + action + 'comment&c=' + id + '&_wpnonce=' + settings.data._ajax_nonce);
 			a.attr('data-wp-lists', 'delete:the-comment-list:comment-' + id + '::un' + action + '=1');
Index: wp-admin/edit-tag-form.php
===================================================================
--- wp-admin/edit-tag-form.php	(revision 47167)
+++ wp-admin/edit-tag-form.php	(working copy)
@@ -76,7 +76,7 @@
 if ( $message ) {
 	?>
 <div id="message" class="notice notice-<?php echo $class; ?>">
-	<p><strong><?php echo $message; ?></strong></p>
+	<p><?php echo $message; ?></p>
 	<?php if ( $wp_http_referer ) { ?>
 	<p><a href="<?php echo esc_url( wp_validate_redirect( esc_url_raw( $wp_http_referer ), admin_url( 'term.php?taxonomy=' . $taxonomy ) ) ); ?>">
 		<?php echo esc_html( $tax->labels->back_to_items ); ?>
Index: wp-admin/includes/nav-menu.php
===================================================================
--- wp-admin/includes/nav-menu.php	(revision 47167)
+++ wp-admin/includes/nav-menu.php	(working copy)
@@ -1227,7 +1227,7 @@
 		sprintf(
 			/* translators: %s: Nav menu title. */
 			__( '%s has been updated.' ),
-			'<strong>' . $nav_menu_selected_title . '</strong>'
+			$nav_menu_selected_title
 		) . '</p></div>';
 
 	unset( $menu_items, $unsorted_menu_items );
Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 47167)
+++ wp-admin/includes/template.php	(working copy)
@@ -1852,7 +1852,7 @@
 		);
 
 		$output .= "<div id='$css_id' class='$css_class'> \n";
-		$output .= "<p><strong>{$details['message']}</strong></p>";
+		$output .= "<p>{$details['message']}</p>";
 		$output .= "</div> \n";
 	}
 	echo $output;
Index: wp-admin/my-sites.php
===================================================================
--- wp-admin/my-sites.php	(revision 47167)
+++ wp-admin/my-sites.php	(working copy)
@@ -55,7 +55,7 @@
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 if ( $updated ) { ?>
-	<div id="message" class="updated notice is-dismissible"><p><strong><?php _e( 'Settings saved.' ); ?></strong></p></div>
+	<div id="message" class="updated notice is-dismissible"><p><?php _e( 'Settings saved.' ); ?></p></div>
 <?php } ?>
 
 <div class="wrap">
Index: wp-admin/options.php
===================================================================
--- wp-admin/options.php	(revision 47167)
+++ wp-admin/options.php	(working copy)
@@ -214,6 +214,11 @@
 	}
 
 	if ( ! isset( $whitelist_options[ $option_page ] ) ) {
+<<<<<<< .mine
+		wp_die( __( '<strong>ERROR</strong>: Options page not found.' ) );
+||||||| .r43326
+		wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
+=======
 		wp_die(
 			sprintf(
 				/* translators: %s: The options page name. */
@@ -221,6 +226,7 @@
 				'<code>' . esc_html( $option_page ) . '</code>'
 			)
 		);
+>>>>>>> .r47167
 	}
 
 	if ( 'options' == $option_page ) {
Index: wp-admin/user-edit.php
===================================================================
--- wp-admin/user-edit.php	(revision 47167)
+++ wp-admin/user-edit.php	(working copy)
@@ -193,9 +193,9 @@
 		<?php if ( isset( $_GET['updated'] ) ) : ?>
 <div id="message" class="updated notice is-dismissible">
 			<?php if ( IS_PROFILE_PAGE ) : ?>
-	<p><strong><?php _e( 'Profile updated.' ); ?></strong></p>
+	<p><?php _e( 'Profile updated.' ); ?></p>
 	<?php else : ?>
-	<p><strong><?php _e( 'User updated.' ); ?></strong></p>
+	<p><?php _e( 'User updated.' ); ?></p>
 	<?php endif; ?>
 			<?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
 	<p><a href="<?php echo esc_url( wp_validate_redirect( esc_url_raw( $wp_http_referer ), self_admin_url( 'users.php' ) ) ); ?>"><?php _e( '&larr; Back to Users' ); ?></a></p>