Updated permalinks
Fixed merge
Fixing config