removed conflict line