Solving conflicts that came from previous merge.