Fixing merge error
Fixing CSS type