GM brings Cadillac back into the fold