Update BlockConduitBundle.java

weird merge issue