wercker deploy
Fix merge trouble