fix(css): remove merge conflicts

Remove the merge conflicts from the file