Resolving Conflicts

By: Slivia B, Jazmin Leon