Fixes stupid header crap.
Resolved conflict.