merge resolution again