Raw table update : adapter
Resloved conflicts