Fixed deploy
Fixed merge