Changed url in confirmation email template.
Resolved merge conflict in confirmation mailer template.