Discipleship—living as a Christian, as a follower of Jesus, however you want to say it—means taking the teachings of Jesus and applying them to our everyday lives. And sometimes that looks like managing conflicts—large or small—with the grace and compassion of Jesus at the forefront of our minds.