add <meta name="viewport">
merge conflict