Routed jcar elems
fixed conflicts