fix schema confict