fix conflicted merge problems.