Fixed merge issues.