Album Template and Album Query
Resolved Conflicts and Merge