Update InstrumentClass.java

conflict merge resolved!!!