Fix Quarix bug in svaing chldren when no parent was changed
Solve issues in test
Solve conflicts