project/show styling
merge conflict
nav update