Removed more conflicts