If you have followed along and given yourself time to make lists and check in with yourself and each other then you have been quite busy and venturous. Either way congratulations for getting to this point. How to put feelings and boundaries together in a way that meet both of your needs and desires.
Conflict is an important ingredient in relationships.
You can not avoid it. It's here to stay so you might as well find a way to have it work for you. Conflict with resolution is what long term relationships have in common.