Fix issue for auto-merge