Cancel button while editing comments or posts now redirects to previous page
Fixing merge