Demo Project to illustrate Conflict Resolution