show album
merge conflict