Aikido is a martial art whose core philosophy is about conflict resolution and taking care of our opponents and ourselves. My experience, and the experience of fellow aikidoists who work in software development, is that the practice and philosophy of aikido enhance our ability to be effective in the workplace. This paper discusses why this may be. Categories and Subject Descriptors K.6.1 [Computing Milieux]: Project and People Management – Management techniques. K.6.3 [Computing Milieux]: Software Management – Software Development General Terms Management, Design, Human Factors. Keywords Aikido, Conflict Resolution.