Edited app name in strings.xml.
first merge conflict!
fixed first merge conflict