yep, I think merge was incorrect here :)