custom\bootstrap conflict solved