Fix 1px border issue for slantedHeader
Fix conflict