edits to intro
fixing conflict