Re-merge draft