Corrected .ui-file merge on previous commit