res android update
merge conflict