Desert city back in army control after rebel attack