Fixed residual merge conflict issues.