Hi Ryan. I can relate to this very well. I am also a Christ-follower and a non-confrontational person. However, I have learned over the years that being a Christian does not mean peace at any cost. That is offering grace without truth. I am guessing that you are probably a 9 on the Enneagram, as I am. The 9 is the Peacemaker. I have come to learn and appreciate the distinction between being a “peacekeeper” and being a “peacemaker.” The former sacrifices boundaries and “truth” to offer grace and keep the peace. The latter maintains healthy boundaries and balances grace with truth in order to be a peacemaker. If you are interested in learning more about the growth path for an Enneagram 9, check out “The Road Back to You” by Ian Cron and Suzanne Stabile.