I just noticed the diff is a bit hard as well. They are "a la git" diffs, so I can't sometimes reject one and keep the other. Then, it would be syntax errors. It means I need to do a lot of manual stuff to clean up some mess.