Resolving line conflicts