settings fragment
fixed strings.xml merge