Fixing some conflicts