Can't see why there would be any conflict. The one issue that seems to crop up occassionally is the bowing we do in class. Bowing is not religious in nature; we bow to show respect and thanks to the founder of aikido, to our teacher, and to our training partners. I don't know any teachers who impose a religious dogma on their students, and aikido is not a religion, it is a martial art.
Hope that helps,