add conflict to old bootstrap module