fix merge conflict in Capfile