Fixed mysterious merge errors.