Getting ready to deploy
Fixed merge conflict