fixed starting unestimated story, corrupted git store, and better message on merges