Dashboard merge resolution