eliminate conflict done