Auto merge navbar
Return a list() for the portal type filter
Merge conflict state