Guerillas tainted by massacre join army