Fix merge conflicht and add t_Co=16 setting