fix merge conflict in styles