Resolved merge conflict in campaign.inc