Resolved merge conflict in Configuration.java