Conflicts: src/board/UBBoardView.cpp src/domain/UBGraphicsItemDelegate.cpp src/domain/UBGraphicsItemDelegate.h src/domain/UBGraphicsPixmapItem.h src/domain/UBGraphicsVideoItem.cpp