View restored after failed merge

modified:   app/main/admin/configuration.lua