paper changes
merge conflict resolved