fixing some conflicts