Fixed infinite loop issue when conflicts detected