added primate
fixed conflict