Added the papertrail version table
Fix merge conflict