calligra confilicts fixed