fixing my merge mistakes..part 2