conflict.

Signed-off-by: Karel Tuma <karel.tuma@gmail.com>