Fix mobile scroll prevention issue
Fix merge conflicts