(#218) - fix _conflicts not in returned results

@jrhicks Squashed your commits and fixed the commit message, also added the http _conflicts param so the test would pass in http as well.
True but if the tests pass, then it will run. It was late last night and I was lazy. :P