fixing my merge mess-up