Update Settings.java

Clear conflicts