Checkbox with HABTM associations
fix conflict gitignore