conflict multiline