Fixed some shit, lel.
Resolved conflicts.