fixed merge errors, whoops