Fixed small merge problems.