Fix Confilict 2