The Holy Spirit and Church Unity

In Acts 2 we read that after the Holy Spirit was poured out on the Church, the Church was in unity around Jesus and his mission. Yet often times when we speak about the Spirit, we speak only in terms of salvation and empowerment. What about the need to discuss the Spirit's role in the midst of conflict?