Ecj conflict fix.