Fixed additional merge conflicts.
Fixed additional merge conflicts.