Bad merge? Hmm... Doesn't git warn about this? (`git gui` does)