Fixed Issue in cshtml template from merge conflict
Fixed Issue in cshtml template from merge conflict

GridProtectionAlliance/PQDashboard,GridProtectionAlliance/PQDashboard,GridProtectionAlliance/PQDashboard,GridProtectionAlliance/PQDashboard