more draft merge functionality