Fix: conflict in rest api