fixing my merge mistakes