Highlight files with conflicts

Signed-off-by: Sven Strickroth <email@cs-ware.de>