Creating the conflict.
Merged the two kiro's and ready to go.