change getExtras
fix strings.xml merge