Resolving merge conflict in scss missed by git.