Better formatting
Conflict resolved
Basic DB query of a many-to-many field. Looks ugly