Missing merge changes and a minor whitespace change