mobile view
merge conflict