Fixing more errors introduced when resolve merge conflicts.