same line conflict