Conflict resolution for CPSC310 Lab2