Fixed merge conflicts in one_per_thread.hpp.