Use correct qml type.
Fix conflicts.