Blue stuffz.
Fixed merge conflicts.