Display 'Merge Conflict' in changes tables in standard black font

Users find the bold red font too distracting.

Bug: issue 2299
Change-Id: Ia6a114c864930d03a1bd9c1234607b0a90b9d8c4
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
Merge "Display 'Merge Conflict' in changes tables in standard black font"