Fill in the Jar Conflict Resolution Template