Fix previous auto-merge