deploying myapp
solved some merge commits