fixed schema conflicts