Merge Update

Merge Conflict Resolution?