Fixed errors caused by manual merge of RCB-101. The merge tool didn't perform up to expectations.
Fixed errors caused by manual merge of RCB-101. The merge tool didn't perform up to expectations.

rosette-api/java,rosette-api/java,rosette-api/java