straightening some wrinkles in the merge