Update Configuration.java
Resolved merge conflict in Configuration.java
Merge branch 'develop'