Updated pretty much fucking everything
Resolved a conflict