Recommitted fixed CommandBlock.java after clash