Conflicts: kaddressbook/merge/autotests/CMakeLists.txt kaddressbook/merge/autotests/mergecontactselectinformationscrollareatest.cpp kaddressbook/merge/autotests/mergecontactwidgettest.cpp kaddressbook/merge/manualmerge/mergecontactwidget.cpp kmail/mailmerge/widgets/mailmergewidget.cpp kmail/tests/CMakeLists.txt