fixed conflict in bundle