Remove merge issue with wercker-box.yml