that should not still have been there

Signed-off-by: Mattias Andrée <maandree@operamail.com>
conflicts can conflict with virtual scrolls

Signed-off-by: Mattias Andrée <maandree@operamail.com>