Hicks gets over concussion and rejoins Twins