Removed some conflicts view