Update DisplaySettings.java

removed merge head leftovers