wercker deploy
merge problems