changes to oauth tests + conflict resolver
removed task factory