Manually fixed Merge Issues

Why the hell did Remi tell us to use this