Add css property detection to <head>
Fix merge conflicts