Fixed merge issue

Pull! These should all be the right files.