"Pictures can be taken"
Merging conflicts
Errors in strings.xml resolved