mobile styling
merge conflict