Merge Week 2 - Communication and Conflict