merge! fix and spec

Addresses #5701 

Note: This also assumes that only the order being merged in is invalid.