still has some conflicts