fix merge conflicts, put back whitespace
2.3.13