fixing my sloppy merge