Fixed compiler error from merge-conflict
Fixed compiler error from merge-conflict

joaander/hoomd-blue,joaander/hoomd-blue,joaander/hoomd-blue,joaander/hoomd-blue,joaander/hoomd-blue,joaander/hoomd-blue