Fixed merge problems.