quickfix after merge