resolved some conflicts with schema change