user album
gitignore conflict