Fixing stupid merge

derp derp