Merge Conflict broke the project...April Fools

Had some weird merge conflict issues. Fixed that shit though.