Added conflict line