added alert dialog to edit story, can't create a story without a name
fix merge conflicts