Resolve rebase conflicts
Ensure playbook support for su params