merging Update CountryActivity.java