Fixed Conflict.
Import some data so it's easier to parse by hand.