Fixed merge conflict in screen.sass