Fix format, remove remrant of conflict resolution

Signed-off-by: Vladimír Štill <[email protected]>
Signed-off-by: Vladimír Štill <[email protected]>

p4-16/spec/P4-16-spec.adoc

@@ -5786,7 +5786,7 @@ include::grammar.adoc[tag=forInitStatement]
 include::grammar.adoc[tag=forUpdateStatement]
 ----
 
-The basic 3-clause `for` statement is similar to a C for statement.  The init statements
+The basic 3-clause `for` statement is similar to a C `for` statement.  The init statements
 will be executed prior to executing the loop.  The condition will be evaluated before
 each iteration, to determine if the loop should exit.  If the condition is false, the loop
 will exit without executing any statements from the loop body or update.
@@ -5805,9 +5805,8 @@ A `continue;` statement may be executed in a loop body to skip the rest of the c
 loop body, executing the update statements and then evaluating the condition to
 either execute the loop body again, or terminate the loop.
 
-The scope of any declaration in a for statement is limited to the for statement and its body.
+The scope of any declaration in a `for` statement is limited to the `for` statement and its body.
 
->>>>>>> upstream/main:p4-16/spec/P4-16-spec.mdk
 [#sec-packet-parsing]
 == Packet parsing