Rename the CSRF token field.
Add actual merge functionality.