Setting the user interface (Qt) and fix merge.