Add is_conflict() to client plugins

Change-Id: I0f4239869da8cab505723ff6b2dfbb37bef83ff1
Merge "Add is_conflict() to client plugins"