Integration conflict solved