Merging.
WE HAVE FUCKING FIXED THE BUGS!