take photo
merge conflict