fixing my merge mess