local changes for merge
merged local edits
scrolling issues and mobile views