conflict resolution on quickstart how-to guide for plugin developers