Fix merge errors in stylesheet