Removed <<<<<<HEAD statements from the file that git left in.
Removed <<<<<<HEAD statements from the file that git left in.

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