css changes for ie10
merge conflict fixing