stashing paper edits
merging paper conflicts