CRS generic data
fixed conflicts