And that's why you always test your merge resolves