Corrects merge errors.

Closes #2937