add chaining to then
merge conflict