Religious differences in a relationship

I am dating a guy that I really really love. Our relationship is great except we have one cross road. He is a semi religious person while I am an atheist. This creates some conflict and can instigate fights when something remotely close to our different religion comes up. It could also create future problems like who will marry us and will we baptize our kids etc. Does anyone have advice on how to maintain the relationship while keep our religious differences not an issue.