Added Big Hack info.
Fixed merge conflict