Avoiding Merge conflicts with a commit

aoeu (that was written on a qwerty keyboard).