fixing merge conflict in styles