Merge conflict must be solved.