Merge on quickfix