Attempting to repair the ballsed up merge