[PATCH] three --merge-order bug fixes