Continue merge preparation: improved project file, desktop file, control panel item