line chart
resolve conflicts