(#218) - fix _conflicts not in returned results
(#218) - fix http _conflicts and finally()