fixed failed auto-merge