Fix merge problems.