solve conflicts.