Your commit is writing checks your merge can't cash.