updated views
fixed merge error routes