settings.java: delete conflict