Conflitos corrigido no home/index e no _layout
Resolvidos conflitos com _layout e collectionscontroller