Removed a line in the intro
Fixed merge