fix some error generated by conflict resolve