add unittest replicating merge failure case