[#54153918] Fix merge conflict in screen.css